* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 0dfd190d753491dc41aeaf9815eb03c10d2f9e06..9ea94b71e0fb54f6ab543630a8e8a8e958899fb3 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -400,7 +400,7 @@ Throw an user-error if we cannot resolve automatically."
                    "\n  - You can safely close this Emacs session and do this "
                    "in a new one."
                    "\n  - When running gitmerge again, remember that you must "
-                   "that from within the Emacs repo.\n")
+                   "do that from within the Emacs repo.\n")
            (pop-to-buffer (current-buffer)))
          (user-error "Resolve the conflicts manually"))))))